updated merge conflict