sublimetext bullshit
conflict resolution
known_hosts
note about not working as a symlink for defaultkeybinding.dict
merge preferences