Fixed the incorrect merge and tests failing because of it