update
resolve merge conflicts and merge