Manual merge with syzygy