fix fallback merge
bump version to 0.1.1