more merge problems I missed