Resolve merge, update gs