v7

merge clear