beginning backup detect
fixing conflicts