felboot: Correct merge conflict