Disregard this as I mistakenly pulled instead of fetch, and created conflicts.