Make sublime merge look like sublime text 3