Merge branch 'jk/faster-name-conflicts'