Implement restaurant APIs
Implement restaurant APIs
resolving merge conflicts