removed the line that was added so merge works