Intermediate commit - displaying Merge correctly on edit page
removed merge from new article form