Marty fix for failed merge