fixed missed conflict
more changes - not completed yet
accCtrl preferences finished with junit