Merging conflicting files