Added --keep-{mine, other} to add command