remove TestGit.txt
Clean up code
Fix merge error
Fix merge error