Cover more merge commits with highlighting