Fix bad merge on ballcatch