merge and ship to 0.0.5