try
Merge remote-tracking branch 'origin'
changed logic
changed logic
Merge remote-tracking branch 'origin'