teach diego merging