Fix duff merge