xinxin is coming
resolve conflicts
navigation finished
enehgn
enheng