Fixed remnants of previous merge conflict