template added
merged, testing route added