testgit conflicts