Remove function from incorrect merge resolve