Fetch from and merge with another branch