IBM Bob Hackathon team: Merge conflicts