Revert "merge conflict resolution"

This reverts commit 7a725accb47279496c1020949f2bb145eeb601ff.