added highlighting
fixed merged conflict