merge files using diff