Initial commit
Solving conflicts