Fixed a submodule conflict I didn't want