added merge output files and gedit backup files to the .gitignore