basic and pretty bad settings parsing from settings.json
missing files for settings
mergeconflics and removing a userfile
merge conflicts and out of date test code