option 5
resolve conflicts