+ [2019-12-06T19:02:03Z] glm I have a repo who has a conflict with a submodule's directory. How do I go about solving it? git status shows nothing abnormal