removed first line
merged conflicts
merged conflicts
Merge pull request #1 from smaranh/master

Conflicts resolved