update main create class 2
conflict merge test