added settings button not function
fixed merge conflict