Fixed one more merge issue