some more merge fixing