Client & Server logic
after pull develop
pull commit
pull commit
merge commit
push commit