Merging SenseiKiwi's merger