Setup files
Setup files and merge