updated to bs 3.0
fixed merge conflict