merging conficts