Re-adds merges for Dimitri