fix bad merge issue