added sublimerge settings