remove dumb
remove dumb shit
fix conflict