[Refactor] - Modify the merge logic to support the mapping of one-to-one and one-to-many
Merge branch 'master' of github.com:migocorp/athena