bad merge issue