more merge updates