bootstrap table added
code review
conflict fix