Resolve merge issues with public contributions