working out merge conflicts