Revert "resolve conflict"

This reverts commit 89be3a81eea9700391de9a39531ab260cb55536b.