more merge shit