Proper Sublime Text merge