Fixed artifact from incorrect merge