Initial commit
Resolving all conflicts
commit1