Syncing master with upstream