fixing a bad conflict resolve