expand conflicting statuses
Merge branch 'dev'