Conflit resolved