Fix merge
Disable fancy folder sharing for now