Incorporate deck.hash into core, #137
Conflict resolution