Core: Fix merge fail