Fixed bugs with edraak_i18n_pull, and made it resolve openedx/LOC-67 conflicts automatically
Fixed bugs with edraak_i18n_pull, and made it resolve openedx/LOC-67 conflicts automatically

Edraak/edx-platform,Edraak/edx-platform,Edraak/circleci-edx-platform,Edraak/circleci-edx-platform,Edraak/circleci-edx-platform,Edraak/edx-platform,Edraak/edx-platform,Edraak/circleci-edx-platform,Edraak/edx-platform,Edraak/circleci-edx-platform