emulate conflict occur

delete one line another people...