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