Convert the merge that Eric added