Ignore backups and temp files
Removed merge conflict backup file