Initial git commit
Merging conflicts