Sublime settings + git merge config