Q#1
Solve Conflicts