merge mistake at routes corrected