CPPE: Resolving conflict