Fix rebase conflict error causing broken GLEW submodule.