Fix casualty of merge