デフォルト設定を正に差し替え
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	Local/Session.sublime_session
	projectfiles/Overview.sublime-workspace