old confs
merge
some cleaning in ssh config