Fixed gitignore
Fixed merge conflicts