Revorked controller and added minutes to getConsumption resolution
Fixed merge conflict