fix(public): Fix merge conflicts