Some changes.
Test for resolve conflicts.