Trying to fix bugging out on merged highlights