two merge conflicts left