Core/Misc: Fix merge fail