newGitTest Made some changes to the readme file also. This should give a conflict as a change was made to the same line.