Added as detached for git submodule
merge conflict