Changed open and close time datatype to Time in restaurants table
Fixed merge confilict as well