[DF-291] Fix merge problem