handle conflict
merge conflict handled