fixing duplicate task after bad merge