Fix Folder Merge Conflicts