solving conflict
just finish solving the trouble