Edit create and edit template sevice code
resove conflict