modified setting files
fixed merge conflicts