Revert "Conflicts solved"

This reverts commit b753026ee1e24d7f32cae7406201cb9158a1e74f.