Revert "merge non-resolved conflicts"

This reverts commit aa7f67bb9526a462e9ad4491c587d578a17793c8.