proper merge

i think