Revert "Conflit instance 2"

This reverts commit d42fbaf8033242b875392f18ebc3d4a242672f72.