accept and reject
Merge branch 'development'