various updates toward testing market functionality for bitassets
Resolve conflict