update sublime config
merge conflict