I think when people use the tag gods it can generally be taken as equivalent to devas. I cannot think of any instance in which a question pertains to one and not the other, so it might be best to merge them.
As for which one should be merged into which, that's a bit trickier. I personally think that using gods to refer to Devas is misleading, as Devas are really mortal Jivatmas and do not truly line up with the Western definition of gods.
Either way, I don't think we need both tags, as they're being used to mean effectively the same thing.