merging after conflict