Fix up master and to start dev on another branch.
Fix merge conflicts.