merge
Add callback functionality
Update merge