Dealt with a brand new timesheet and the issues that generated.
Merge remote-tracking branch 'mainRepo/master'