Fix diverging conflicts, not sure how this happened but it did