.
..
....
commit that resolve internal conflict