Would've been better to not merge the main branch again. Not needed, and I can always do it while reviewing if it is.