Revert "removed folder conflict"

This reverts commit 9d0aeaa5d5f11dc79854dd8655331b53da05d737.