Core/Chat: Fixed merge error