change:add setting_about_us
change:change stting aboutus
change: fixed conflict