working on HomeActivity
fixed merge conflict