made multiple changes to get repo in sync again