Revert "resolve conflict"

This reverts commit d5d2215c4365aa6793a0a4ecbba3cf78dfd64e67.