actually fix conflicts