[DF-185] Fixed merge issu