Remove double appearance of merge from frontend agent view
Merge pull request #80 from mark-cooper/double_merge_agent

Remove double appearance of merge from frontend agent view