fsharp done
fixed merge