test 2
resolve conflicts