alias for macports
reconcile merge