fixed bad merge on my end