fix for more merge errors