Add merge functionality (with notifications)