Strapi-Github Question

PS:I kept the default .gitignore file

in my admin dashboard I added a plugin and a custom codee for email provider
and my friend added tables to the backend and when trying to merge it just fails and It wasn’t the case when we just started out
I got errors unrelated history to all files too