A new fix for the conflicts in merging.