we are stylin! (almost)
fixed merge err