resolving conflicts from backups

Signed-off-by: Jonathan E. Magen <yonkeltron@gmail.com>