Added merging tutorial to TODO file