Closes #85 (implement merge)