updated .gitignore to handle git resolution backup files