button logout change action
logo resize
merge conflict