Cleaning up files from merge operation