add a merge tool and use web.py instead of the bottle