fix weird merge issue