minor
rm settings
dirty merge