The conflict between those two countries stopped, but the tension is still there. The Georgian air space has been violated twice by several Russian planes by going 18 km into the Georgian territory. At the same time the Minister of Defense denied all the statements made by the Georgian party, as the Russian military planes did not carry out flights over the territory of Georgia.
However it would be interesting to suppose what would have been the attitude of Russia towards Georgia if it was part of Nato, or vice versa…