FIXING GIT ISSUES AND BUGS