Add set-merge-config anchor to resolve line-endings conflict