Fixed Conflicts

Fixed conflicts in the home view