Fixing merge issues
Removing GitWinCredstore module
Adding git-credential-winstore