Revert "conflic resolutions"

This reverts commit 44d938822b04f10e39400104bc290059abd10608.