adds interrupted action and cuke for conflicts and removes ruby2.1 methods

this is pretty clever.

It's a little weird to be manipulating the session in the middle of a view, but at this point this is probably the only way to do this in one spot, and you didn't even have to add any conditions ;)