yup, first merge wins!