Clean up more merge mess