non-conflicting change by learn_git