server & git issues changes