Resolve conflicts during merge of `nalanda-rct3` to branch.