Bootstrap - Jquery plugins ns
merge conflit