Bring main server up to date with master