Since I moved the conflict stuff back into `checkout.c`, this can go back to being `static`.