stopped redundant merges, added reconfigure note