merge
fix merge
correction routes. fixes #17