possible resolution of git shit