Add merge functionality (with notifications)

@jbirdjavi 
This isn't part of your changes, but you should just be able to use find instead of find_by here.