Fix merge conflict. Double free.