updated merge file