Pretty-print to make merge conflicts less likely