Add sublimerge, disable vintagelines