add ECDSA support
fix ECDSA merging conflicts