added a warning in the git process
more merge text removal
additional text about the process on git