reset
Local merge squash
Merge remote-tracking branch 'origin/development'