• Keep the codebase 'mergable'