cleanup mismerge with oppo