anchor.diff:               * forget the meta annotation in case this second uvar is not solved.
                * See #1561. *)
             | Some _ ->
  ->>>>>>> master
               begin match (SS.compress r).n with
                     | Tm_uvar (ctx_u', _) -> unresolved ctx_u'
                     | _ -> false
  
positive.code: 
      imps, b
  
  <<<<<<< HEAD
  let resolve_implicits' env is_tac g =
    let must_total =
      if is_tac then false
      else (not env.phase1 && not env.lax) in
  
    let rec unresolved ctx_u =
      match (Unionfind.find ctx_u.ctx_uvar_head) with
      | Some r ->
          begin match ctx_u.ctx_uvar_meta with
          | None -> false
          (* If we have a meta annotation, we recurse to see if the uvar
           * is actually solved, instead of being resolved to yet another uvar.
           * In that case, while we are keeping track of that uvar, we must not
           * forget the meta annotation in case this second uvar is not solved.
           * See #1561. *)
          | Some _ ->
  =======
  (*
   * Check that an implicit solution t has an expected type k
   *   we know that G |- t : (G)Tot k', for some k'
  
negative.code: let universe_inequality (u1:universe) (u2:universe) : guard_t =
      //Printf.printf "Universe inequality %s <= %s\n" (Print.univ_to_string u1) (Print.univ_to_string u2);
      {trivial_guard with univ_ineqs=([], [u1,u2])}
  
  