removing rounded border radius, finishing false indication step
fixing merge conflicts
merge conflicts