Bad merge, simple fix