[SERVER] ClarificationServer almost completed
using theirs
Resolving conflicts