Resolve merge conflict to restore new public share functionality