Add merge functionality (with notifications)

@jbirdjavi