Fix problem during merge