Changed help command as a ConflictResolver