all abstracts have conflicts

[laszewsk]

all your abstracts show conflicts in your checkins. YOu have not resolved them, so they show up in your text. I recommend you fix

[SGiulianiGH]

I will message you separately on Piazza because you may see that first.
I have re-uploaded my files. I ran the make command and the PDF was created successfully with no errors. I verified that the PDF does look good and all citations come out correctly in the bibliography.
However, the text that is shown in the Mast abstract compilation (volume 7), the odd text and errors that look as if they were a part of the abstracts are not my doing. I do not know why these errors occur and I have ensured they do not show when I run the make command. To me, it looks like my old descriptions and bad citations are what have been tacked on to the end of my updated abstracts and these old abstracts are what are getting the errors from your auto-check.

Please verify and let me know if this is the case or if I am missing a step.
Thank you.

[laszewsk]

Thank you for fixing, I will update the proceedings.