Removed the line added when conflict came up
Revert "Removed the line added when conflict came up"

This reverts commit bd21cdfd63e4eed5b757b8041f2049af9922e449.
removed the reverted commented removal agian
adding random lines
Merge branch 'slave'

Conflicts:
	New Text Document.txt
message
Merge branch 'master' of https://github.com/Rajesh317/sample