JigarJoshi/test-git — pull request #3 by amitpal9 (2014-09-21 01:20:03+00:00)
Title: let's try conflict

try how to merge conflicting file