added 'file'
'file's merged manually