Solving conflicts
solving conflicts
Solve button added, no functionality