git pull their files
fix all the conflict
I am so proud of ma self fragment addcard database lololol