Add x64 version.
Resolve conflict