New version
Solving conflicts