Merge with OpenNumismat