Conflict is now solved