Changed task routes
Fixed merge errors