more merge fixing