Revert "Resolving conflicts"

This reverts commit 10c98538599391636dbc62ac702ccf4ad8484746.