Added hive data in gen_data.py
Fixed merges