undo merge from bug fix for reporting files