I just want to reiterate this point

[josephLeiferman]

Always make sure to pull from the repository and get the current version before you make a commit. If you do not it will mess up every single file.

[weigui]

There was no conflict when I created the pull request, Because I had already pulled the latest version. I'm not sure what caused those conflicts