preparing a conflict
preparing a conflict 2
resolved the conflict