fixing yet another stuid merge mistake