one more merge tweak