updated GIT
resolved conflicts