now --fast-merge is default. so it is removed from the parameters,
instead, there is a new parameter for alignment-based '--slow-merge'.