Merge conflict
Extract filling one card.