remove merge issue