Vultr: Agent Rush Hackathon team: The Merge Conflicts