With the updated merge