get rid of conflict