I have a merge conflict - Its telling me i need to resolve it in the working tree however when i go on source control on vscode it says that i need to initialise a git repos
