Fixing conflicts
Revert "Fixing conflicts"

This reverts commit 2c87d9e139fe3918f9aad44fe52e9b3f41f814f6.
Revert "Revert "Fixing conflicts""

This reverts commit 4649ee4e9f9bf2492feae520d7696c4252f65c71.