updated merge log