added conflict.txt in test branch
Conflict has been resolved. for a tutorial on this process, read http://www.gitguys.com/topics/merging-with-a-conflict-conflicts-and-resolutions/