Git merge conflicts are normal and okay. They are supposed to happen and, most likely, will happen regularly. They don’t happen because you did something wrong. They happen because Git is trying to protect you from losing your hard work.
But they can be frustrating and sometimes we don't know how to best resolve them and move forward with our work. This video shows you how to avoid unnecessary conflicts and three ways to resolve them when they do happen.
My Git Essentials learning experience is a great way to learn everything you need to know about Git, including how to create workflows, fix problems, and collaborate with others.