Merge changes from File Manager