Added all files
'merge'