added .gitignore with different ids
fixing merge conflicts