Revert "Fixing conflicts"

This reverts commit 29ceacc691d560a2114219e80856a9374dddb8b7.