fixing merging issues after a directory compare