sublime settings
conflict resolution