damn conflict

<div class="stack stack--large">
  <div class="cover with--lighter-bg">
    <div class="cover__img" style="background-image: url('http://thedesktopcollection.com/free-wallpaper/woodpile-jono-renton.jpg');"></div>
    <div class="wrapper wrapper--wide">
      <div class="cover__specs">
        <div class="cover__specs__img">
          <img src="http://fillmurray.com/320/200" alt="">
        </div>
        <div class="cover__specs__body">
          <div class="cover__specs__body__title">
            <h1 class="heading heading--mega with--white-text">{{model.title}}</h1>
          </div>
          <ul class="horizontal-specs">
            <li class="horizontal-specs__item with--text-i">
              <span class="with--text-strong">{{model.filledSlots}} of {{model.slots}}</span> members
            </li>
            <li class="horizontal-specs__item with--text-i">
              <span class="with--text-strong">{{model.category.name}}</span>
            </li>
            <li class="horizontal-specs__item with--text-i">
              you pay <span class="with--text-strong">{{model.priceLower}}-{{model.priceUpper}}</span> for a car worth up to <span class="with--text-strong">${{model.highestPossiblePrice}}</span>
            </li>
          </ul>
        </div>
      </div>
    </div>
  </div>
</div>

<div class="wrapper wrapper--wide">
  <div class="content-layout">

    <div class="content-layout__sidebar">
      <div class="stack stack--large">
        <ul>
          <li class="stack">
            {{#link-to "share.payment" class="button button--block"}}
              Pay for this share
            {{/link-to}}
            {{#link-to "share.proposal" class="button button--block"}}
              Propose an item
            {{/link-to}}
            {{#link-to "share.inquire" class="button button--block"}}
              Request to join
            {{/link-to}}
          </li>
          <li class="stack">
            <a class="anchor anchor--prominent" href="#">Edit this share</a>
          </li>
        </ul>
      </div>
      <div class="stack stack--large">
        <div class="stack">
          <h2 class="heading--2 with--text-strong with--light-less-text">Members of {{model.title}}</h2>
        </div>
        <ul class="user-list">
          <li class="user-list__item">
            <img class="user-list__item__img" src="http://placehold.it/60" alt="">
            <div class="user-list__item__name">
              <span class="with--text-strong">Name</span><br>
              <span class="with--text-small with--text-i with--light-less-text">Administrator</span>
            </div>
          </li>
          <li class="user-list__item">
            <img class="user-list__item__img" src="http://placehold.it/60" alt="">
            <div class="user-list__item__name">
              <span class="with--text-strong">Name</span><br>
              <span class="with--text-small with--text-i with--light-less-text">Member</span>
            </div>
          </li>
          {{!-- <li>
            {{model.createdBy.fullName}} <br>
            Administrator
          </li>
          {{#each member in model.members}}
          <li>{{member.user.fullName}}</li>
          {{/each}} --}}
        </ul>
      </div>
      <div class="stack stack stack--large">
        <div class="stack--heading">
          <h2 class="heading--2 with--text-strong with--light-less-text">Share this Divvy</h2>
        </div>
        <a href="#">Facebook</a>
        <a href="#">Twitter</a>
        <a href="#">Email</a>
      </div>
    </div>

    <div class="content-layout__main">
      <div class="stack">
        <h2 class="heading--2 with--text-strong with--light-less-text">About this Divvy</h2>
      </div>
      <div class="user-content">
        <p>{{model.description}}</p>
      </div>
    </div>
  </div>
</div>

<div class="with--light-bg" style="padding: 20px 0;">
  <div class="wrapper wrapper--main">

    {{!-- Comment form --}}
    <div class="media">
      <div class="media__bit">
        <img class="avatar" src="http://fillmurray.com/70/70" alt="">
      </div>
      <form class="media__body" {{action "createPost" on="submit"}}>
        <div class="form-section">
          {{textarea value=newPostContent class="textarea textarea--block"}}
        </div>
        <div class="form-section with--text-right">
          <button type="submit" class="button">Post post.</button>
        </div>
      </form>
    </div>

    {{!-- Proposals --}}
    {{#each proposal in model.proposals}}
    <div class="stack with--white-bg">
      <div class="container">
        <div class="media">
          <div class="media__bit">
            <img class="avatar" src="http://fillmurray.com/70/70" alt="">
          </div>
          <div class="media__body">
            <div class="stack">
<<<<<<< HEAD
              <div class="stack">
                <h3>
                  {{#link-to "user" proposal.user class="anchor with--text-strong"}}{{proposal.user.fullName}}{{/link-to}} proposed an item <span class="with--light-less-text">{{time-since datetime=proposal.createdAt}}</span>
                </h3>
              </div>
              <div class="stack">
                <img src="http://fillmurray.com/300/200" alt="">
              </div>
=======
              <h3>
                <span class="with--text-strong">{{proposal.user.fullName}}</span> proposed an item <span class="with--light-less-text">{{time-since datetime=proposal.createdAt}}</span>
              </h3>
>>>>>>> b86844800673a35706101a86211708eaf5ae7c80
              <a class="anchor with--orange-text" target="_blank" {{bind-attr href="proposal.url"}}>{{proposal.url}}</a>
            </div>

            <div class="stack stack--large">
              <p class="user-content">{{{proposal.body}}}</p>
            </div>

            <div class="stack stack--large">
              <ol>
                <li class="stack">
                  <div class="media">
                    <div class="media__bit">
                      <img class="avatar" src="http://fillmurray.com/30/30" alt="">
                    </div>
                    <div class="media__body">
                      <span class="with--text-strong">Bill Murray</span> vote <span class="with--text-strong with--red-text">No.</span> <span class="with--light-less-text">2 hours ago</span>. <br>
                      <p>Because I'm Bill Murray. That's why.</p>
                    </div>
                  </div>
                </li>
                <li class="stack">
                  <div class="media">
                    <div class="media__bit">
                      <img class="avatar" src="http://fillmurray.com/30/30" alt="">
                    </div>
                    <div class="media__body">
                      <span class="with--text-strong">Bill Murray Clone</span> vote <span class="with--text-strong with--green-text">Yes.</span> <span class="with--light-less-text">2 hours ago</span>.
                    </div>
                  </div>
                </li>
              </ol>
            </div>

            <div class="stack stack--large">
              <div class="stack">
                <h3 class="heading heading--2">Vote on this proposal</h3>
              </div>
              <button class="button with--green-bg">Yes</button>
              &nbsp;
              <button class="button">No</button>
            </div>

            {{!-- Comment form --}}
            <div class="media">
              <div class="media__bit">
                <img class="avatar" src="http://fillmurray.com/45/45" alt="">
              </div>
              <form class="media__body">
                <div class="form-section">
                  <textarea class="textarea textarea--block textarea--filled"></textarea>
                </div>
                <div class="form-section with--text-right">
                  <button type="submit" class="button">Comment</button>
                </div>
              </form>
            </div>

          </div>
        </div>
      </div>
    </div>
    {{/each}}

    {{!-- Posts --}}
    {{#each post in model.posts}}
    <div class="stack with--white-bg">
      <div class="container">
        <div class="media">
          <div class="media__bit">
            <img class="avatar" src="http://fillmurray.com/70/70" alt="">
          </div>
          <div class="media__body">
            <div class="stack">
              <h3>
                {{post.user.fullName}} <span class="with--light-less-text">{{time-since datetime=post.createdAt}}</span>
              </h3>
            </div>
            <p class="user-content">{{{post.body}}}</p>
          </div>
        </div>
      </div>
    </div>
    {{/each}}

  </div>
</div>


{{outlet "modal"}}


{{!-- {{model.status}}
{{model.city}}
{{model.state}}
{{model.latitude}}
{{model.longitude}}
 --}}

{{!-- {{time-since datetime=model.createdAt}} --}}
 {{!-- {{model.createdAt}} --}}
{{!-- {{model.updatedAt}} --}}