fix button issue
your grandma
add card flipping logic
fix merge issue