configure class
configure class
resolved conflict