[hack] rm confict