Resolve merge conflict content-session-single