Fixing merging conflicts
Fixing merging conflicts


Former-commit-id: 2fdc538c6c9da552fd32d563c8907c1ed4d05b66
iLanguage/iLanguage,vronvali/iLanguage,vronvali/iLanguage,iLanguage/iLanguage,cesine/iLanguage,vronvali/iLanguage,vronvali/iLanguage,vronvali/iLanguage,iLanguage/iLanguage,iLanguage/iLanguage,vronvali/iLanguage,iLanguage/iLanguage,cesine/iLanguage,cesine/iLanguage,cesine/iLanguage,cesine/iLanguage