Did Yongqi and Swallow get married in Princess New Zhu Huan?

In Princess New Zhu Huan, the swallow didn't marry Yongqi, but Yongqi married Xinrong. After fleeing, Swallow and Yongqi signed a two-year contract. Yongqi went back to the palace to give birth to a grandson for Princess Discovery, but after two years, she asked go to dali to find a swallow, and the last one went north and the other flew south. Two years later, Yongqi came to Dali. Yongqi at this time is no longer Yongqi, but Yan Fu -tern.