Fix issue when full url is used
Fixed merge confluct with running stats