Merge messed up some wc stuff.