Initial commit
All conflicts solved