fix left over conflict
fix left over conflict

opencb/opencga,opencb/opencga,opencb/opencga,opencb/opencga,opencb/opencga,j-coll/opencga,j-coll/opencga,j-coll/opencga,j-coll/opencga,j-coll/opencga,opencb/opencga,j-coll/opencga