Resolved dependency conflicts.

Vault AMP now builds correctly.