Modified on adro to make a conflict