Consolidating fork to parent repo