Conflict is now resolved