.....setting ....half done
setting goes crazy...
Merge remote-tracking branch 'origin/master'