Initial commit
Conflicts solution