resolve conflic sample
Merge remote-tracking branch 'origin/TransactionAutoNumber-fatur'
resolved project master