Fix outstanding merge conflict