Revert "Solve merge conflicts"

This reverts commit f85cb4fe7a48d254b22a46e9a7a4136e2a89e3cc.