Fix conflicts in astyle options.