jk now, i fixed all the merge conflicts