Commented conflictive code.