More merging functionality and test - Trello 174