worked on some styling
fixed conflict