\began working on about tumo page
Fixed merge connflict