[DF_883] try to fix wrong line endings after merge