Small edits to Gregor's merge