First grading pass.
Added merge form.
Merge only presented to admin.
Corrected Gemfile
Corrected Gemfile
Updated Gemfile.lock
Ajusted comment merge logic.
Ajusted comment merge logic again.
Ajusted comment merge logic again.
Ajusted comment merge logic again.
Added debug statements.
Still chasing comment merge failure.
Still chasing comment merge failure.
Still chasing comment merge failure.
Simplified merge.
Simplified merge.
Simplified merge again.