Fix problem with merge.