merging all conflicts