can I blame that on a bad merge?