commented out bootstrap editing
merge conflict
change
js contact