stack traces now using logger
resolved conflicts
memory limit