Revert "resolve merge conflict"

This reverts commit 10601b10f4cff208efefc37e3c55e265c4e7889b.