resolve last merge conflicts