End page welcome
resolve conflicts