Fix restaurant links
Fix merge conflict