Adding the initial files
Solved the merge conflict