client merged
magician merged