some copywriting
resolved merge conflict
some response stuff
lots more styling
fixed conflicts
response stuff