First commit enable Sublime Text 3
Indent fix
update merge