Trying to resolve an issue which is probably caused by git