Client - Update: CMain, CPreRendering (Getter)
Merge Error