Made changes to styles
Fix merge conflict within application.html.erb