Merge "Remove overwrite configuration and convert it to mapping merge configuration"