fix bad merge
fix bad merge

Signed-off-by: Chris Granger <5654cde260ae99bc4d30054171b8bcd902efd19a@gmail.com>

kidaa/Eve-1,bjtitus/Eve,bluesnowman/Eve,kidaa/Eve-1,justintaft/Eve,justintaft/Eve,justintaft/Eve,bluesnowman/Eve,kidaa/Eve-1,pel-daniel/Eve,kidaa/Eve-1,bjtitus/Eve,bluesnowman/Eve,pel-daniel/Eve,bluesnowman/Eve,pel-daniel/Eve,justintaft/Eve,bjtitus/Eve,bjtitus/Eve,pel-daniel/Eve