merge errata