Add merge functionality (with notifications)

@jbirdjavi 
Makes sense.  I'd stick with find_by then.