updated blackscholes
Fixed conflicts