acenctab: Fix merge conflict