add edit feature to restaurants
fix merge conf