Fixed Issue
Fixed the todo list
More Stuff
Resolved Conflicts