adding gitignore
resolving conflicts