cleaning up the shit from last night
fixed merge conflict