after merge with files on bigdog