Provide option to merge with --ff