solve conflicts after merging