Dev: Fix merge issue