resolve merge conflicts. it works yay