The only conflict is resolved