solve merge conflict
settle merge conflicts