Revert "Revert "conflict resolve""

This reverts commit 5f328e3fa39ed919997c3cf3efa9f71f3740165f.