add local settings files
fix settings conflict