updated merge feature