Fixed a merge problem
More fixes with merge