Merge with upstram