updated merge test