Remove leftovers of merges

Andrii Verbytskyirequested to merge
averbyts/athena:cleanup_head into master
  • Removed "<<<<<<< HEAD" from the sources.

All the occurrences were commented.

Merge request reports