Fixed bad conflict fix