fixing setting
Merge remote-tracking branch 'origin/master'
fixing setting 2
Merge remote-tracking branch 'origin/master'
fixing setting 3
Merge remote-tracking branch 'origin/master'
fixing setting 4
almost fix setting