updated corner radius
update merge conflict