Remove conflicted sublime files and add gitignore