Fix the broken merge bits, again

Authored by leinir on Nov 8 2017, 1:56 PM.