Fix bad conflit resolution