resolve conflicts in Intro.java