adding warning if darkfile update fails
fixing conflicts, not really conflicts