Fixing merge conflicts, and updating readme and gitignore