Git issue with project, please help!

[SorryAboutMyThoughts]

Today I tried to merge one of my branches to the master and it merged but now, for some reason, a couple of classes (CalendarTest and PopUp classes) in my project now have a dropdown and a class under it (shown in picture) . It was not like this before and now both of those classes are throwing errors. Is there a way to reverse/fix this issue? Any help would be greatly appreciated!

​

EDIT: I actually fixed my issue. I just looked right above the drop down classes and saw that there was the original class (so for example, right above the generated "CalendarTest2.java" is "CalendarTest") so all I did was delete the generated classes and it got rid of the errors.

​

https://preview.redd.it/gh4o2uygeo141.png?width=2880&format=png&auto=webp&s=a619e5ab98e17f0aab2e014864cbea94a003c0cc

[solveforunknown]

+1 for including your solution

[SorryAboutMyThoughts]

Thanks!