remove confict