Fixing the git mess