new changes
resolve conflicts