Weird things happened post-merge, redownloading FC 2.2.3 fixed it