Added alias mo for merge -s ours