Synchronize with nAa merges