solve merge conflict