Remove merge conflict artifacts
Minimised the task list (done)
minimised task list (done)