change page
resolve conflicts