Revert "various changes to get merge conflict"

This reverts commit 36c22302b04ad464db47cce1dbf41dadf8888507.