@Houl Sounds like cleaning up a Git conflict, all right.