scrip tags on paid part
border rounded
border change
borders again
conflict resolve
conflict resolve