So I don't know why it's telling me there are conflicts so I'm just gonna "manually merge" this (by just copying the final file) cause I'm too tired to deal with imaginary merge conflicts.
So like it's merged but not officially. Sorry for taking this long.
So I don't know why it's telling me there are conflicts so I'm just gonna "manually merge" this (by just copying the final file) cause I'm too tired to deal with imaginary merge conflicts.
So like it's merged but not officially. Sorry for taking this long.