fix for bad merge