Added section on confilct detection to STM and comments on STM chapter