Merge work with Dharma