getting rid of conflict