Tidy up missed syntax in conflict resolution.