got it!, before any pushing, I  will handle all conflicts first~