Fixed file1
Handle merge