Fixed gitignore
Fixed merge conflict