sty
fixed merge issues (i think)
prework
recommit