started styling on kit list
conflict fix