Fixed conflicts in submodule