Fix links in Services tutorial
Merge conflict fixed