Updated package list and settings
Fixed merge conflict in README.md