tmp_commit
resolved a conflict in check_goftari.py