Resolved conflict with restaurant_base over menu edit permissions