Fix problem with merge