buggered up a merge