endpoint update
resolve merge