fixed 2 rest services
Fixed merge conflict