removed settings files
merge