fix a bug related to instruction storage in db.
fix merge conflict.