IBM Bob Hackathon team: Merge Conflict