Fixes more merge fial