fixing bad merge, maybe