fixes routing error to get all that jazz working again
fixes merge conflicts