file-1 checked in as file-2