<div class="container">
  <section class="page-header">
    <h1>Edit Nitpick</h1>
  </section>
  <section>
    <form action="/submissions/<%= submission.key %>/nits/<%= nit.id %>" method='POST'>
<<<<<<< HEAD
      <%= erb :"submissions/comment", locals: {nit: nit} %>
      <button type="submit" name="nitpick" class="btn btn-primary">Update</button>
=======
      <textarea name="body" class="col-md-6 col-md-offset-3" rows="10"><%= nit.body %></textarea>
      <div>
        <button type="submit" class="btn btn-primary">Submit</button>
      </div>
>>>>>>> Migrate bootstrap grid
    </form>

    <form action="/submissions/<%= submission.key %>/nits/<%= nit.id %>" method='POST'>
      <input type="hidden" name="_method" value="delete">
      <div>
        <button type="submit" class="btn btn-danger" name="delete">Delete</button>
      </div>
    </form>

    <span>Parsed with <a href="https://help.github.com/articles/github-flavored-markdown" target="_blank">GitHub Flavoured Markdown</a></span>
  </section>
</div>

<div class="container">
  <section class="page-header">
    <h1>Edit Nitpick</h1>
  </section>
  <section>
    <form action="/submissions/<%= submission.key %>/nits/<%= nit.id %>" method='POST'>
      <%= erb :"submissions/comment", locals: {nit: nit} %>
      <div>
        <button type="submit" class="btn btn-primary">Submit</button>
      </div>
    </form>

    <form action="/submissions/<%= submission.key %>/nits/<%= nit.id %>" method='POST'>
      <input type="hidden" name="_method" value="delete">
      <div>
        <button type="submit" class="btn btn-danger" name="delete">Delete</button>
      </div>
    </form>

    <span>Parsed with <a href="https://help.github.com/articles/github-flavored-markdown" target="_blank">GitHub Flavoured Markdown</a></span>
  </section>
</div>

Remove conflict markers from edit page
Remove conflict markers from edit page
