resolve conflicts on getting-started