-edited files for merge