TDQ-8787 lost some code in TableMasterDetailsPage when resolve conflicts