merging
Merging affordance updates