bug #4103 Tracking report: cannot delete a statement
Fix merge conflicts