Gemfile fix
Cucumber tests for merging
Merge functionality
Merge articles and tests working