correcting files after merging