add feature to change only a part of the merge behavior

If you want to change only one thing in the merging behavior, it's nicer to only specify that single part. These commits adds that feature.