Merge conflict fix

Okay. I apologize for the vague branch name here. I had to resolve the submodule conflict manually.