changed display
resolved conflicts