Add list about merge and rebase observations
Merge branch 'dev'