Test to attempt merging of conflicting files.