fix conflicts
fix conflicts

tpetricek/FSharp.Formatting,mktange/FSharp.Formatting,ademar/FSharp.Formatting,tpetricek/FSharp.Formatting,theprash/FSharp.Formatting,theprash/FSharp.Formatting,theprash/FSharp.Formatting,mktange/FSharp.Formatting,mktange/FSharp.Formatting,tpetricek/FSharp.Formatting,theprash/FSharp.Formatting,tpetricek/FSharp.Formatting,ademar/FSharp.Formatting,mktange/FSharp.Formatting,mktange/FSharp.Formatting,ademar/FSharp.Formatting,ademar/FSharp.Formatting,ademar/FSharp.Formatting,tpetricek/FSharp.Formatting,theprash/FSharp.Formatting,mktange/FSharp.Formatting,theprash/FSharp.Formatting,ademar/FSharp.Formatting,tpetricek/FSharp.Formatting