Modify gradle files.
Merge .
Fix query merchant detail info.