yeah so most of the projects I've worked have some form of version control as I find it really handy in case I accidentally write an important piece of code or something happens like electricity falls or whatever also it is really helpful in projects that involve team collaboration because we can host repository on a platform such as github and then we can collaborate in real-time also the fact that we can share repositories pretty easily is also very handy and you talked about merge conflict so there were a few times when merge conflict arise so whenever merge conflict arise I usually try to use the try to assess whatever code that is conflicting and try to manually select the parts of the code that I want to keep that's basically the kind of approach that I usually take with the version control system such as git
