Revert "Conflict fixing"

This reverts commit 302b3c7f2dad4a5dd09ee4924b72081b1451742f.