Change resolving of local files conflicts by creating a new FileSet parent container for every add