removed extra code from old merge