resolved merge conflict
added line1 to file1 from develop
created file3
Merge pull request #1 from omarshaik/develop

Develop