gross merge mostly done; left MERGE markers in a few spots