Few changes that needed to be pushed in order to switch branches
Merge remote-tracking branch 'origin/server' into server