Dynamic files to preview
Conflict resolve