fix merge disaster