Allowed user to specify the merging policy
60 files changed