Fixed Davidson method
Fix merge