Revert "resolve merge conflict"

This reverts commit c8502bc9bb233bb4a074192aac27ffc8651c5fb6.