prepare merging

for merge hj