Adds talks
Fixes conflicts