IBM Bob Hackathon team: The Merge Conflicts