fixes a bad merge