fix merge and update to 0.2.4