home page styles merge conflict resolution
home html.erb and default css.scss files conflicts are resolved