service overview finished and service details started
merge conflict resolved