assembly_stat.py
resolved conflict