modified the second line, practice resolving conflicts with collaboration
adding resolved conflict file, Merge branch 'master' of https://github.com/sujageorge/swc-remote-george

Conflicts:
	firstfile.txt