Testing merge conflicts
Resolved merge issue
Merge pull request #2 from SydMusavi/test-repo-demo1

Testing merge conflicts