fixing conflict in subscriptions_controller
fixing conflict in subscriptions_controller

drdispatch/koudoku,mozestudio/koudoku,drdispatch/koudoku,mozestudio/koudoku,mozestudio/koudoku,andrewculver/koudoku,drdispatch/koudoku,andrewculver/koudoku,andrewculver/koudoku