conflict remove works