added support for highlighting splits and merges