merge hell

stupid merges