* Fix duplicate declaration issue when removing conflicting packages