testing of git and conflits/branching