fix merging screwup on my side