Conflicts: app/controllers/comments_controller.rb app/views/comments/edit.html.haml app/views/issues/show.html.haml db/schema.rb