Resolve Conflict Resolution Template