Remove a spare "<<<< HEAD" from a previous merge.
Merge all of Jan's changes.