Add no-merge-point configuration