Beatles added
Solving conflicts