the restaurant tags
fixed merge conflicts in bootstrap css