bugfix  | date added
merge conflicts
new task debug WIP