updated merge