Ignoring swap files, missing comma in csl_field_order, reorganized conflict for readability.