Reverting another merge error