Added a note to the todo
Resolve merge conflicts