Getting rid of conflict