Updated gitignore
Fixed conflicts