Fixed error due to bad merge