fix merge dropped %endif