gettin sassy
fixed merge conflicts