more merge stuff