Change Blackscholes slightly so it can use new diffing mechanism. Bug with merge code fixed