[DF-291] Fix problem with merge