are included. Basic [...] project can be seen [...] that you can work with a
which can occur [...] competing changes. It can [...] , The basic "merge conflict