fail on merge, fuckin git on windows