Initial commit
Resolving all conflicts