Updates/cleanup
Add mm => merge --no-ff