Conflit Merged