Revert "Conflict resolution"

This reverts commit a03e64cd23c6d02a6ca2081300d01fe65c2f5a41.