Revert "confilict resolution"

This reverts commit fba9fa2ddc9b2c108c54e639025b7f98780844b7.