Merge branch 'bc/clone-bare-with-conflicting-config'