Fix issues with file and merge