update after merge conflict