fixed error (modified setting files) caused by checkout to the master branch