controllers/merge: reformatted code to stay within 80 columns