Added entries to gitignore
Fixed merge conflict