hax: Fix some merge problems