Merged all subfolder changes