delete function
resolved conflicts