Reorganizing code
Solving conflicts