Revert to last known good commit.
Merge branch 'dev-branch'