commit about fix conflict