fix 0.6.2 conflict