merge mod version 2.0