Revert "conflict solve"

This reverts commit 34ceaafa143d5f152cec3ab2d4e68ce4152c36c4.
bug fix