Merged mods and fixed changelog