Sublime settings
Fixed Merges