bug fix
merge with settings of other computers