<commit_before><div class="container profile-container">
  <div class="row">
    <div class="col-md-4 user-profile-col">
      <div class="user-profile">
        <div class="user-picture" style="background: url('<%= gravatar_for @user %>')"></div>
        <div class="user-name">
          <p>
<<<<<<< HEAD
            <%="#{@user.profile.first_name} #{@user.profile.last_name}"%>
=======
            <%=@user.profile.first_name.to_s+" "+@user.profile.last_name.to_s%>
>>>>>>> 29fb93808bd9d63aae119737ee368fd5f3c0682a
          </p>
        </div>
        <div class="user-biography">
          <p>
            <%if(@user.profile.about.nil?)%>
            <%="Edit info about you."%>
            <%else%>
            <%=@user.profile.about %>
            <%end%>
          </p>
        </div>
        <div class="user-location">
          <p>
            <%=@user.profile.location%>
          </p>
        </div>
      </div>
    </div>
    <div class="col-md-8">
      <div class="row">
        <div class="user-contact-info">
          <div class="user-profile-link">
            <%if(@current === true)%>
            <div>
              <button class="btn btn-default" data-toggle="modal" data-target="#pass" style="margin-left: 70%;border-radius: 3px;width: 12%;background-color: #2E2F30;color: white;display: inline;">Password</button>
              <button class="btn btn-default" data-toggle="modal" data-target="#myModal" style="border-radius: 3px;width: 12%;background-color: #2E2F30;color: white;display: inline;">Edit</button>
            </div>
            <%end%><commit_msg>Fix merge conflict<commit_after><div class="container profile-container">
  <div class="row">
    <div class="col-md-4 user-profile-col">
      <div class="user-profile">
        <div class="user-picture" style="background: url('<%= gravatar_for @user %>')"></div>
        <div class="user-name">
          <p>
            <%=@user.profile.first_name.to_s+" "+@user.profile.last_name.to_s%>
          </p>
        </div>
        <div class="user-biography">
          <p>
            <%if(@user.profile.about.nil?)%>
            <%="Edit info about you."%>
            <%else%>
            <%=@user.profile.about %>
            <%end%>
          </p>
        </div>
        <div class="user-location">
          <p>
            <%=@user.profile.location%>
          </p>
        </div>
      </div>
    </div>
    <div class="col-md-8">
      <div class="row">
        <div class="user-contact-info">
          <div class="user-profile-link">
            <%if(@current === true)%>
            <div>
              <button class="btn btn-default" data-toggle="modal" data-target="#pass" style="margin-left: 70%;border-radius: 3px;width: 12%;background-color: #2E2F30;color: white;display: inline;">Password</button>
              <button class="btn btn-default" data-toggle="modal" data-target="#myModal" style="border-radius: 3px;width: 12%;background-color: #2E2F30;color: white;display: inline;">Edit</button>
            </div>
            <%end%>
{'fraction_non_alphanumeric': 0.1969048403029305, 'fraction_numerical': 0.020085610800131708, 'mean_word_length': 2.2046413502109705, 'pattern_counts': {'":': 0, '<': 91, '<?xml version=': 0, '>': 91, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2867579', 'n_tokens_mistral': 1034, 'n_tokens_neox': 968, 'n_words': 167}