Code

test that git status works with merge conflict in, .gitmodules