Branch-02 add new int member
resole conflict