fixing conflicts
Updating DM branch