[DF-3871] Fixed multiedit merge issues