resolved conflict devise parameters