Added merge files to gitignore

This should prevent that merge files are committed to the repository.