Fixing merge buggery