Update ssh/known_hosts
kwalletrc
resolve merge conflict