fix(public): Merge