fixed transactions_controller conflict