fix merge issue with parent version