resolving git issues