AI app: Merge Conflict Resolver using IBM BOB for IBM Bob 2.0 hackathon