Initial commit
Merging and resolving the conflicts