fix merge conflicts, update routes