my cards panel added
merged conflicts