The conflict commit
Test conflict solve