bad things happened during that last merge