rewrite services page
fixed merge conflicts