Update .gitignore
Update to include TA work
Fix merge conflict