sublime git merge and conflict edit tools