conflict fix?
bunch of fixes for destroy and nested routes