fix merge problem radically