add revive logic
fix imports merging problem