Resolving conflicts | lit.salon