Fetch and merge from upstream