Add first tests for git lib
merge conflict