Merge "Resolving a field naming conflict caused by the table join."