more pretty stuff
fixed merge stuff