handle merge conflick
Revert "handle merge conflick"

This reverts commit 571db2fd664ae316ea54e333da4b8c4b3e59b523.
Revert "Revert "handle merge conflick""

This reverts commit 4056de7b4fb4f1beb27403130e831ed05299b114.