cards page finished
fixed conflicts