dumb
Conflict solved
Backlog, etc. added