From 1f014daaa0b8b9a4b3c67000136e2b6dedfc97cb Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 2 May 2017 07:26:48 -0500
Subject: [PATCH] Fix merge error

---
 BizHawk.Emulation.Cores/Calculator/TI83.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.cs b/BizHawk.Emulation.Cores/Calculator/TI83.cs
index 28ab8bc4a8..d8d4e9695e 100644
--- a/BizHawk.Emulation.Cores/Calculator/TI83.cs
+++ b/BizHawk.Emulation.Cores/Calculator/TI83.cs
@@ -205,7 +205,7 @@ namespace BizHawk.Emulation.Cores.Calculators
 						// 4-7 - Unknown
 						////if (onPressed && maskOn) ret |= 1;
 						////if (!onPressed) ret |= 0x8;
-						return (byte)((Controller.IsPressed("ON") ? _maskOn : 8) | (LinkActive ? 0 : 2));
+						return (byte)((_controller.IsPressed("ON") ? _maskOn : 8) | (LinkActive ? 0 : 2));
 					}
 
 				case 4: // PORT_INTCTRL