Fixed more merge