resolving pre-git conflicts