Wait..there were more merge things. Fixed now to what we had on Friday