merging shit
oops