MERGE-CONFLICT | Hackathon Radar