check new != old
Merge branch 'dev'