Merge Conflict 50: We Have Standards