for the merge
merge...
add preferences ui