Make merge an instance method and complete the specs.
Fix problems in merge action and specs.

Don't try to store a model in the session.
Return to the edit page after a merge.
Call Article#merge! instead.