Error Fix

Just fixing one of those <<<<HEAD >>>>>ORIGIN/MASTER errors that popped
up.