removed submodule directory to resolve conflicts