fixed conflicts
added highlight and highlightsystem files