Added base commit of old manual repo
Fixed conflict