merging and stuff
oops, fixing super crucial error that broke everything. sorry