make sure everything is up to date on server

local copy at work seemed to be showing some unresolved conflicts