Milestone 1 error

did I do a mistake in merging or do I need to change the main function too?

No you dont have to make any change in file shown in screenshot, proceed with the milestones, complete every TODO and then use ./gradlew build.

@Kunal is right, please continue with your tasks @yuva.