Mod: proper merge