proper loading of filesync
merges