Revert one star import
Merge