merge ok and service detail fixed