separate blockchain actions
fix merge conflict