webserver local modifications commit (google analytics, etc. from yesteday deployment)
local changes and pull changes manual merge