oops hadn't resolved a merge apparently