fixes bad merge
cleanup