support for Intel PCM
Fixing conflicts