Fixed error created through merge conflict.