commit fo future resolve conflict2.