error해결 및 gitmerge

client/src/components/CountButton.js

-import {useState} from 'react'
-const CountButton = ({count, setCount}) => {
-    const name = name
+const CountButton = ({name, count, setCount}) => {
     function handleCount(event) {
         if (event.target.name === "backbutton") {
             setCount({...count, [name] :count[name] - 1})