Resloving conflicts