Creating new folder and file
fixed merge