Repo out of sync with latest, trying to resolve