was doing something stupid in merge