test conflit smartgit