sublimerge updates + less