Quick-and-dirty hacks for single-file merges