fixed services merge conflict