trying to resolve git