Now text under done, star yeah
Fixed conflicts