var line 26 welcome.js
commented out a: hover bootstrap.css
merge conflict