Fix missing file from merge problems