thay doi config view
Merge remote-tracking branch 'origin'