styled it all up
no worries cuz
Fixed conflict