IBM Bob 2.0 hackathon team: Merge Conflicts_404