reset bootstrap css
merge error