Merge, hopefully without screwing too much up.