merging behavior update