fix conficts of merging amp-0.9 branch