resolve last merge conflict