Handle nil index entries in resolve conflicts
There may be cases in the ResolveConflicts RPC where one of the required conflict parts (ancestor/our/their) is missing. This may have been causing a nil dereference error in production. This change improves error handling by checking for nil and returning an appropriate error.
Part of #3289 (closed)