bug fix for bad merge